From 4ca2632d42e183065e2b8e959e8a21bcd584b474 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 14 Oct 2010 13:43:08 +0200 Subject: [PATCH] gdk: add slots for all GdkWindowObject signals Also add padding for future extension. --- gdk/gdkwindow.c | 6 +++--- gdk/gdkwindow.h | 31 ++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 8be5dcc213..6e39e86314 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -428,7 +428,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass) g_signal_new (g_intern_static_string ("pick-embedded-child"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - 0, + G_STRUCT_OFFSET (GdkWindowObjectClass, pick_embedded_child), accumulate_get_window, NULL, _gdk_marshal_OBJECT__DOUBLE_DOUBLE, GDK_TYPE_WINDOW, @@ -455,7 +455,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass) g_signal_new (g_intern_static_string ("to-embedder"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - 0, + G_STRUCT_OFFSET (GdkWindowObjectClass, to_embedder), NULL, NULL, _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER, G_TYPE_NONE, @@ -484,7 +484,7 @@ gdk_window_class_init (GdkWindowObjectClass *klass) g_signal_new (g_intern_static_string ("from-embedder"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - 0, + G_STRUCT_OFFSET (GdkWindowObjectClass, from_embedder), NULL, NULL, _gdk_marshal_VOID__DOUBLE_DOUBLE_POINTER_POINTER, G_TYPE_NONE, diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h index 05a998930e..b7897ce55a 100644 --- a/gdk/gdkwindow.h +++ b/gdk/gdkwindow.h @@ -490,9 +490,34 @@ struct _GdkWindowObjectClass { GdkDrawableClass parent_class; - cairo_surface_t * (* create_surface) (GdkWindow *window, - gint width, - gint height); + GdkWindow * (* pick_embedded_child) (GdkWindow *window, + gdouble x, + gdouble y); + + /* the following 3 signals will only be emitted by offscreen windows */ + void (* to_embedder) (GdkWindow *window, + gdouble offscreen_x, + gdouble offscreen_y, + gdouble *embedder_x, + gdouble *embedder_y); + void (* from_embedder) (GdkWindow *window, + gdouble embedder_x, + gdouble embedder_y, + gdouble *offscreen_x, + gdouble *offscreen_y); + cairo_surface_t * (* create_surface) (GdkWindow *window, + gint width, + gint height); + + /* Padding for future expansion */ + void (*_gdk_reserved1) (void); + void (*_gdk_reserved2) (void); + void (*_gdk_reserved3) (void); + void (*_gdk_reserved4) (void); + void (*_gdk_reserved5) (void); + void (*_gdk_reserved6) (void); + void (*_gdk_reserved7) (void); + void (*_gdk_reserved8) (void); }; /* Windows -- 2.30.2